Added some spec functionality