Many services changes, added exceptions support