#21 Replacing the existing plug-ins by the equivalent DSL calls