FIxed bug in title checking
Refactoring / extracted mapped types
Added some documentation
Refactoring / extracted properties