Added optional modify field to User