Added class references, allowing for custom values :D