Added basic wrapper objects.