Started adding serial support