Add FIXME of removing code duplication