Now showing JNDI name for sources, allow user to choose source model name, refactoring