Added better support for old specs