Added check for project keys and improved cli