Try moving oxam functions into separate file again