Try to move to singleton model