Added kadira support