Get rid of composition in API activity model