Changes after Stage moved to Devel API