Added keyword functionality (almost)