Removed composition support for now