Handling Non Functional Endowments