Added dojo support