Support added for user defined compositions