Change namespaces and introduce plug() method