Improved how both API behave