Added few typedefs. Minor changes