Added more methods and removed class name
Return self for method chaining