Changed comments from embedded to belongs to relatinship