removed basic models, changed URI generation