Updates for new Hallinta and aliases