Refactor more with concerns