Refactored with concerns