Add new methods and fix modifiers