user schema orgainization - TODO: update spec