Removed API dependency on MCA.java