Fix comment
Fix function into classes with final keyword
Improve context system