Created category mapping
Merge branch 'feature/elements' into develop