Cleaner handling of additional return properties