Furhter improve decorator handlign