Added some spec-related things