Changed name for association
Added base class for holder