Improve work structure