Made changes to preserve ABI and API in future