Modified Activity and ActivityMap