Replace tuples with classes
Use -dev tag for in-dev versions