Fixed some methods, cyclic relation