Add context sensitive completion and locate