Feature/x3 keywords