Add new keywords structure + abstraction layer improvements