Some changes and customizations