Break free from dependency cycle