Bug Fix - class optimizations