Added base and custom property handlers to data repositories