updated sample analytics framework