Updated forms, added services