Add more compact syntax
Dropping 1.8 & REE, and adding 2.0 support