Added a wrapper