Made components data oriented