Added config support and some notations