changed container type
removes runtime issues during requests
code cleanup