Added key check on service
Typeo bug wclWrappers