Latest changes to improve performance