Changed the way of doing the nothing and nil singletons