Changed resources management to bundle base