Fix and refactor cuttlefish schema#2