ERP-1036 Changes for Marco Logico

Added logic.
ERP-1036 Changes for Marco Logico

Git forgot some files.