added call to :configuration_for_configuration_or_instance instead of redundant code