Added initial support for universal projects