Agree, any suggestions to improve the schema?