Add DEBUG feature