Some performance enhancements + conversion