Add two methods; rename namespace