Version 1.1 w/ backwards compatibility