support for few more types and also completion for array access