Exposing more stuff :|