Add support for --core-only flag