Added options, performance enhancements