Added abstract-overwrite handling