apply new cpi docorators - cpi looks nice and clean now, and has less modules
dependencies...