Re-factored API as vars