Started adding public API