Removed hardcoded keys