Added computer and user models