Add support for compose