Put categories, class factory methods, singleton in