Elevatate to independent classes