Started work on more schema components