Added composer and mappings