updated todos
added support for composer mapping