Changed deprecated non-dsl methods