Removed status enum and changed to string