Added serializer mappinng and applied php-cs-fixer