Refactor PKP DSL