Added object picking