Changed dsl a bit.