Initial release
Refactor: Extract to base class
Refactor: Extract to base class