Changed from class to namespace