Avoid direct querying where possible