Optimizations that can be done in 1.4.9

Possible optimization + necessary changes to support both 1.4.8 and 1.4.9+