Instance builder moved to EDP