Adding compose functionality