Update Querys, small design changes