Added Select source for Grid

With small refactoring