Added forced get
Added missing methods
Removed old global variables