Improved Block class