Extracted out methods to separate classes