Add additional keywords
Switch from cl to cl-lib