Refactored to instances