Some changes to support installation via composer