Made classes static