Firstly I love the prison and dungeon thing but what about a detention facility? A place where people can be held for as little or as long as you like and a deportation facility where criminals can also deported.
Plus additional residential building options and visually upgradable residential buildings.