Updated to include delete functionality