added support for CreatedUser and ModifiedUser