Added more performance improvement