Updates to new format

 * Removes scope and forEach attributes
 * Makes certain attributes mandantory