Modified for make it downgrade compitible_some more changes added related to method definitions