improved twoway plugin & decorators