Use declarative syntax when possible
Use declarative syntax when possible

Signed-off-by: Nicolas De Loof <27d8e526c390473e9c51da80626c6b0539b42f4f@gmail.com>

thaJeztah/compose,vdemeester/compose,thaJeztah/compose,vdemeester/compose