need some manhandling in Models