Switched to using attrs method from raptor-utils