Included untracked files and solved refined serialization and mapping (AutoMapper)