Updated shortcuts
Updated serialization
Updated serialization
Updated serialization