Refactored for better import statements