Some changes for usability