Extended area by fisherman.
Updated names.
Use new shape protocol.