Removed the dependency to availabilities classes.