Added a more dsl-like format