Fix with proper attribute types