Added integration with Rafael new changes and mines