Add serializer
Authenticated maker mixin
Rename
Reworking things