Revamping Model interfaces