Added Support for Links
Update Package for easier developing created