Updated resource imports