Fixed option passing bug; Reduced the memory footprint