Added support of session definitions