Attempt to solve circular import issue