Removed cyclic require issue in model