Corelib updates, with interface and model