Added self returns in methods for chaining purposes