Back button support + few fixes to model definition