Added basic user support and drone