change some parameters types to better reflect role