Fixed mapping creation
Fixed some elements