minor changes in order to close model to sources generation