Big update, made queryable better as well as the Data Context.