minor changes - imports, case classes definitions