Externalized simple queries and improved documentation