Fixed unsafe Allocs, Moved away from singletons