CrudHandler adjustments