Added namespace layout