Issue 274/platform licensing - Work In Progress

Added the new changes for licensing.