Made additions to the user and application models