Added nice to have features