New api structure - input messages refactored