It's ok now + made CLI a bit more flexible