Avoid dependency cycle