Updated the way keywords are executed