Additional features + form-based workflow added