Made mass compileable
Added FromUnit method