Handling dynamic source objects #30