Added basic wrapper