Added connection.block support