Fixed issues... The UniversalCore integration is now complete