Updated with latest changes documentation