Initial support for multiple data types in the admin panel