Decrypted for API, and fixed circular reference issue for now