Refactoring
Quick support changes
Made non-static methods