Add some classes to make life easier