Added abstract container