#132 CloseableBase replaced by Closeable and CloseableImpl