Modified interface for calling and slight change in dictionary