Improve handling single specs