Made compatible with maven