Added things, workaround with commands