Update loader to include common objects such as value object and enum