Fix serializer
Fix routes