Updated the core interface to something that is more close to the correct one.