Resource manage enhancement (incomplete)