Added NDEBUG support