Initial checkin of deprecated API implementation