Add FIXME to methods pending to be refactored