Moved capabilities back into eve-common