Renamed more and moved code to Block interface.