fixed namespaces
changed smth
changed method access
identity map now uses container