Make work with latest changes