@brutski These should be updated to new spec syntax