Added support for Block and updated namespace