Added subject labels from properties and also updated db schema