Updates to keep things back-compatible

i.e., all old public functions still exist