Some changes for better testing