Added Serializable to new classes