Added support for universal build

Added support for universal build