Updated for Buoy micro-library