Changed Default types to use fully qualified classes