Removed contains from classes, not inheritance was used