Added compatibility api 8