Added more composition functionality