Restructure associations to add delegate for extension overriding the default