Added changes to fiscal position model