Closed #26; closed #25

Small changes to schema