Changed model function names