Add enum values
Further work to connection