More configurability and queries.