Updated with Future API changes