Refactor to remove global methods
Add missing method
Reactor to not use class_eval
Fix method getter and setter