Issue: 444 - Fix schema