Added features which improved performance