Decouple container from application