Updated wrapper to allow some parameters