Better documentation. Added mapping helper methods.