Added wrapper classes to help keep the code clean.