Yes, should I put it in core ? For server it is not an issue, but for client it just makes me itch, although I know it depends on -core too :)