Updated models and made them use fluent api

Signed-off-by: Travis Shanks <shankstravis90@gmail.com>