Add evil number support