Seems to work avoiding the circular import