Version 0.0.2-dev

Rework API mapping method