More work on composer