Updated with latest features