Updated to one array, updated Crud functionality