Version 0.2.0 - Converted to declarative format