DG: Fixed API and documentation issues (REF-333)