Add a wrapper for testing