Updated to the latest narra-core