Adds a few more specs and some utilities