Moved singleton to core