Improved licenses and added government classes