Added universal support