Added more database querys in models