Even more changes for handle change