Made specs a bit more explicit