Moved wrappers in separate classes