Improve drupalapp class