Refactor with specific classes