Finished Serializer refactor again