Get rid of useless boolean flags
Use modern specs