Improvements on handling extended spec