Some payment related changes and model restructure