Save itemStack, not id and metadata
Oups, missing class in the last commit