Made the grammar even more exact to our use cases