Changed model handling to collection return