Added support for keywords where (easily) possible