Rewrote kit methods to use new decorator