Some infrastructure/future features structure added