Support newer syntax, old syntax support needs work