Uncomment user data
Fix imports