Additionnal architecture modifications