Fixed and restructured specs