Updated to new Core and independent build system.

Seems to work without problems.