Added element lookup and removal routines