Moved to static library