Syntax changed and classes removed