Speed improvements and renaming
Refactored get/set and removed ___get/___set dependency