Updated hama-core