Added optional wrapper class