BDD - Query & Commit Management Part II