Added serializable extension to wrapper classes