Updated package name and tweaked deserialisation process