Extracted the rest of the methods.