Making some functionalities and L compatibility