Added proper updating of castles and users