Better use of schemas