Addressed @smarterclayton comments on schema