rake tasks updated, final value classes added