Expand functionality of index/new/create