Move some Querys to Models