Updated with new documentation