- Added suppport for load, eval