Try to remove dependency cycle