Added more dynamic support