updates according to latest framework stuructre changes