Refactor the extension

To be able add more methods.