Breaking out functions and adding query syntax
Version bump