More work on intellisense