Schema fixes, adding indexes back with hibernate annotations on
sub-class