Add keyword
Correct implementation bugs.