Changed strings to appropriate objects