Interface namespace + Lot of improvements