Changed definiton format