Added flatering namespace