Adding compose feature