Changes for security and licence issues