Added basic list and user classes