Some improvements in usage