Issue #78 Legacy Api