Performance improvements

Created by: dzaporozhets