Added proper IDE support