Code cleaned, updated mapping, more block support