Add boolean
Finish keywords