Added un/serialize(), getAll(), some renaming