Updated base to include defragment and apigen