added class aliasses to avoid class conflicts, fixed geo behaviour