Exception added and some documentation