Custom user schema bug
Prepare for release