added serializable to necessary classes