Added to allow wrapper