Modified API internally