Changed to use @import-once in case of repeated importingng

Changed to use @import-once in case of repeated importing