major update to main devkit classes