Add types and phone to DB/JSON related methods