Added proper Buffer support so binary is supported correctly