Updated the Schema more because I can't stay away.