Improved license stuff