Some more options for custom class names, implement functionality to handle deprecated stuff