Fix getting of container
Refactoing of ResultSet, fix usage of verbose mode