Added design and workflow changes