added automapping to 3 functions