ERP-1036 Changes for Marco Logico

Added more functionality.