Add special cases