refactor & add BeanSource Converter