Added class as namespace