Moved to _data structure instead of indiviudal includes