Added instance variable map