Some changes imported from Alexandria project