Further progress on api