Fixed component dependecy, still lengthy