Added some changes and mappings