Improve future framework