Added some decoration implementation and fields