Refactor of work plan and proposed approach