Added Priority and handled cases where defaults not set