Adding Serialization capabilities where appropriate