Refactor DataValueHandlers to contain their own table definitions