Refactored instances so that they can render themselves directly