Application part was refactored