Added right click open support