Adding effective address calculations