add little optimization with access to instances. Added list component