Added tools & more block properties