Moved code to os-store