Added hibernate annotations, without testing