cms-2141(getting started) + cms-2155(code refactoring)