Adding handling for dedications