Working on SDK 0.4.x