AW-1840 #comment adding schema to user