Add support for goofs