Moved modules into the stack
Updated features to 2.x