Improve decorator