Adding non-python-specific functionality