Added features to cage option management