Added functionality of multi-entry-points and reverted some other changes