MOre composer updates