Updated composer handling.