Add some pre/post conditions