Updated with Float support