Added updatables framework