Further refactoring;

- Go through decorator to access resource attributes for display.