Adding basic Risk functionality