starting migration to new JSPP model