Made some updates to base controllers