Strucure changed according to fhibernate conveces