Implemented makers fully
fixed user serializing issues