some decoration serialization changes