Made things more streamlined in terms of what components need to inherit