Changed Draw and View service to generic