Added check to see if the field exists before creating new instance.
Added mapped class to configuration.
Added check to determine if the configuration was for the current entity.