Started to add license support