Added propereties to models
Added database stuff