Changed import structure for cleaner usage