Added mapping methods
In progress