added configuration and wrapper