Issue #19 - Updated User schema