Improve return types definitions