Modifications to use include it as library class