Added pseudo handling + few improvements