Partially added the status functionality