Changes for performance improvement