Is there a better way for this schema?