Changed Assembly builder