Implemented keywords infrastructure (fixed #17)