Preparing support for f4 cores