ADDED: Additional composer stuff