Rewrote and extending of APIKeyValidator